Rename gtk/gtk.rc.in to gtk/gtk-win32.rc.in because the build-dll

script (in GLib) looks for the resource file having the same basename
as the DLL being built. Update configure.in and gtk/Makefile.am accordingly.

diff --git a/ChangeLog b/ChangeLog
index d8b1b7cb8f382937a02a6ceafe693ea2b5d421cd..7769ce2725307641bb5a4854d48868d3e02f5746 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,7 +15,7 @@
        * gdk/win32/Makefile.am: Corresponding changes.
 
        * gtk/gtk.rc: Remove.
-       * gtk/gtk.rc.in: New file.
+       * gtk/gtk-win32.rc.in: New file.
        * gtk/Makefile.am: Corresponding changes.
 
        * configure.in: Corresponding changes.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d8b1b7cb8f382937a02a6ceafe693ea2b5d421cd..7769ce2725307641bb5a4854d48868d3e02f5746 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -15,7 +15,7 @@
        * gdk/win32/Makefile.am: Corresponding changes.
 
        * gtk/gtk.rc: Remove.
-       * gtk/gtk.rc.in: New file.
+       * gtk/gtk-win32.rc.in: New file.
        * gtk/Makefile.am: Corresponding changes.
 
        * configure.in: Corresponding changes.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d8b1b7cb8f382937a02a6ceafe693ea2b5d421cd..7769ce2725307641bb5a4854d48868d3e02f5746 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -15,7 +15,7 @@
        * gdk/win32/Makefile.am: Corresponding changes.
 
        * gtk/gtk.rc: Remove.
-       * gtk/gtk.rc.in: New file.
+       * gtk/gtk-win32.rc.in: New file.
        * gtk/Makefile.am: Corresponding changes.
 
        * configure.in: Corresponding changes.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d8b1b7cb8f382937a02a6ceafe693ea2b5d421cd..7769ce2725307641bb5a4854d48868d3e02f5746 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -15,7 +15,7 @@
        * gdk/win32/Makefile.am: Corresponding changes.
 
        * gtk/gtk.rc: Remove.
-       * gtk/gtk.rc.in: New file.
+       * gtk/gtk-win32.rc.in: New file.
        * gtk/Makefile.am: Corresponding changes.
 
        * configure.in: Corresponding changes.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d8b1b7cb8f382937a02a6ceafe693ea2b5d421cd..7769ce2725307641bb5a4854d48868d3e02f5746 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -15,7 +15,7 @@
        * gdk/win32/Makefile.am: Corresponding changes.
 
        * gtk/gtk.rc: Remove.
-       * gtk/gtk.rc.in: New file.
+       * gtk/gtk-win32.rc.in: New file.
        * gtk/Makefile.am: Corresponding changes.
 
        * configure.in: Corresponding changes.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d8b1b7cb8f382937a02a6ceafe693ea2b5d421cd..7769ce2725307641bb5a4854d48868d3e02f5746 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -15,7 +15,7 @@
        * gdk/win32/Makefile.am: Corresponding changes.
 
        * gtk/gtk.rc: Remove.
-       * gtk/gtk.rc.in: New file.
+       * gtk/gtk-win32.rc.in: New file.
        * gtk/Makefile.am: Corresponding changes.
 
        * configure.in: Corresponding changes.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d8b1b7cb8f382937a02a6ceafe693ea2b5d421cd..7769ce2725307641bb5a4854d48868d3e02f5746 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -15,7 +15,7 @@
        * gdk/win32/Makefile.am: Corresponding changes.
 
        * gtk/gtk.rc: Remove.
-       * gtk/gtk.rc.in: New file.
+       * gtk/gtk-win32.rc.in: New file.
        * gtk/Makefile.am: Corresponding changes.
 
        * configure.in: Corresponding changes.

diff --git a/configure.in b/configure.in
index 9b036704c8a96753626e0118c7823a2cef331d35..216702f377289f26290332fe3be7f12cb705b053 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1046,7 +1046,7 @@ gtk/Makefile
 gtk/makefile.mingw
 gtk/makefile.msc
 gtk/gtkcompat.h
-gtk/gtk.rc
+gtk/gtk-win32.rc
 gtk/stock-icons/Makefile
 modules/Makefile
 modules/linux-fb/Makefile

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index fbb459823270a2b5e6d2c4f6052a8a099c85a2cb..7053e50ce484ee015dd3633cb81dc79707633730 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -613,7 +613,7 @@ makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gtk/makefile.mingw.i
 makefile.msc: $(top_builddir)/config.status $(top_srcdir)/gtk/makefile.msc.in
        cd $(top_builddir) && CONFIG_FILES=gtk/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-gtk.rc: $(top_builddir)/config.status $(top_srcdir)/gtk/gtk.rc.in
+gtk-win32.rc: $(top_builddir)/config.status $(top_srcdir)/gtk/gtk-win32.rc.in
        cd $(top_builddir) && CONFIG_FILES=gtk/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 .PHONY: files test test-debug
@@ -656,8 +656,8 @@ EXTRA_DIST += @STRIP_BEGIN@         \
        check-n.xpm             \
        test.xpm                \
        gtk.def                 \
-       gtk.rc                  \
-       gtk.rc.in               \
+       gtk-win32.rc            \
+       gtk-win32.rc.in         \
        makefile.mingw          \
        makefile.mingw.in       \
        makefile.msc            \

diff --git a/gtk/gtk-win32.rc.in b/gtk/gtk-win32.rc.in
new file mode 100644 (file)
index 0000000..871fe05
--- /dev/null
+++ b/gtk/gtk-win32.rc.in
@@ -0,0 +1,30 @@
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+  FILEVERSION @GTK_MAJOR_VERSION@,@GTK_MINOR_VERSION@,@GTK_MICRO_VERSION@,BUILDNUMBER
+  PRODUCTVERSION @GTK_MAJOR_VERSION@,@GTK_MINOR_VERSION@,@GTK_MICRO_VERSION@,0
+  FILEFLAGSMASK 0
+  FILEFLAGS 0
+  FILEOS VOS__WINDOWS32
+  FILETYPE VFT_DLL
+  FILESUBTYPE VFT2_UNKNOWN
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+      BLOCK "040904B0"
+      BEGIN
+       VALUE "CompanyName", "The GTK+ developer community"
+       VALUE "FileDescription", "GIMP Toolkit"
+       VALUE "FileVersion", "@GTK_VERSION@.BUILDNUMBER"
+       VALUE "InternalName", "gtk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@"
+       VALUE "LegalCopyright", "Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Modified by the GTK+ Team and others 1997-2000."
+       VALUE "OriginalFilename", "gtk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.dll"
+       VALUE "ProductName", "GTK+"
+       VALUE "ProductVersion", "@GTK_VERSION@"
+      END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation", 0x409, 1200
+    END
+  END

diff --git a/gtk/gtk.rc.in b/gtk/gtk.rc.in
deleted file mode 100644 (file)
index 871fe05..0000000
--- a/gtk/gtk.rc.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <winver.h>
-
-VS_VERSION_INFO VERSIONINFO
-  FILEVERSION @GTK_MAJOR_VERSION@,@GTK_MINOR_VERSION@,@GTK_MICRO_VERSION@,BUILDNUMBER
-  PRODUCTVERSION @GTK_MAJOR_VERSION@,@GTK_MINOR_VERSION@,@GTK_MICRO_VERSION@,0
-  FILEFLAGSMASK 0
-  FILEFLAGS 0
-  FILEOS VOS__WINDOWS32
-  FILETYPE VFT_DLL
-  FILESUBTYPE VFT2_UNKNOWN
-  BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-      BLOCK "040904B0"
-      BEGIN
-       VALUE "CompanyName", "The GTK+ developer community"
-       VALUE "FileDescription", "GIMP Toolkit"
-       VALUE "FileVersion", "@GTK_VERSION@.BUILDNUMBER"
-       VALUE "InternalName", "gtk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@"
-       VALUE "LegalCopyright", "Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Modified by the GTK+ Team and others 1997-2000."
-       VALUE "OriginalFilename", "gtk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.dll"
-       VALUE "ProductName", "GTK+"
-       VALUE "ProductVersion", "@GTK_VERSION@"
-      END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-      VALUE "Translation", 0x409, 1200
-    END
-  END